gtk: Use const instead G_CONST_RETURN
authorJavier Jardón <jjardon@gnome.org>
Mon, 6 Jun 2011 18:13:44 +0000 (19:13 +0100)
committerJavier Jardón <jjardon@gnome.org>
Fri, 10 Jun 2011 12:07:54 +0000 (13:07 +0100)
87 files changed:
gtk/gtkaboutdialog.c
gtk/gtkaboutdialog.h
gtk/gtkaction.c
gtk/gtkaction.h
gtk/gtkactiongroup.c
gtk/gtkactiongroup.h
gtk/gtkassistant.c
gtk/gtkassistant.h
gtk/gtkbutton.c
gtk/gtkbutton.h
gtk/gtkcellarea.c
gtk/gtkcellarea.h
gtk/gtkcolorbutton.c
gtk/gtkcolorbutton.h
gtk/gtkcombobox.c
gtk/gtkcombobox.h
gtk/gtkentry.c
gtk/gtkentry.h
gtk/gtkentrybuffer.c
gtk/gtkentrybuffer.h
gtk/gtkexpander.c
gtk/gtkexpander.h
gtk/gtkfilechooserbutton.c
gtk/gtkfilechooserbutton.h
gtk/gtkfilefilter.c
gtk/gtkfilefilter.h
gtk/gtkfontbutton.c
gtk/gtkfontbutton.h
gtk/gtkfontsel.c
gtk/gtkfontsel.h
gtk/gtkframe.c
gtk/gtkframe.h
gtk/gtkiconfactory.c
gtk/gtkiconfactory.h
gtk/gtkicontheme.c
gtk/gtkicontheme.h
gtk/gtkimage.c
gtk/gtkimage.h
gtk/gtkimagemenuitem.c
gtk/gtklabel.c
gtk/gtklabel.h
gtk/gtklinkbutton.c
gtk/gtklinkbutton.h
gtk/gtkmenu.c
gtk/gtkmenu.h
gtk/gtkmenuitem.c
gtk/gtkmenuitem.h
gtk/gtknotebook.c
gtk/gtknotebook.h
gtk/gtkpapersize.c
gtk/gtkpapersize.h
gtk/gtkprinter.c
gtk/gtkprinter.h
gtk/gtkprintjob.c
gtk/gtkprintjob.h
gtk/gtkprintoperation.c
gtk/gtkprintoperation.h
gtk/gtkprintsettings.c
gtk/gtkprintsettings.h
gtk/gtkprogressbar.c
gtk/gtkprogressbar.h
gtk/gtkrecentfilter.c
gtk/gtkrecentfilter.h
gtk/gtkrecentmanager.c
gtk/gtkrecentmanager.h
gtk/gtksearchenginebeagle.c
gtk/gtkstatusicon.c
gtk/gtkstatusicon.h
gtk/gtkstylecontext.c
gtk/gtkstylecontext.h
gtk/gtktextmark.h
gtk/gtkthemingengine.c
gtk/gtkthemingengine.h
gtk/gtktoolbutton.c
gtk/gtktoolbutton.h
gtk/gtktoolitemgroup.c
gtk/gtktoolitemgroup.h
gtk/gtktoolpalette.c
gtk/gtktoolpalette.h
gtk/gtktreeviewcolumn.c
gtk/gtktreeviewcolumn.h
gtk/gtkwidget.c
gtk/gtkwidget.h
gtk/gtkwidgetpath.c
gtk/gtkwidgetpath.h
gtk/gtkwindow.c
gtk/gtkwindow.h

index 5692273e7297cb1307c660b867026cadb9f18f30..ae6c91865fcffd794f6ee18c407d43cfead6a69d 100644 (file)
@@ -1024,7 +1024,7 @@ gtk_about_dialog_show (GtkWidget *widget)
  *
  * Since: 2.12
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_about_dialog_get_program_name (GtkAboutDialog *about)
 {
   GtkAboutDialogPrivate *priv;
@@ -1104,7 +1104,7 @@ gtk_about_dialog_set_program_name (GtkAboutDialog *about,
  *
  * Since: 2.6
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_about_dialog_get_version (GtkAboutDialog *about)
 {
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
@@ -1152,7 +1152,7 @@ gtk_about_dialog_set_version (GtkAboutDialog *about,
  *
  * Since: 2.6
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_about_dialog_get_copyright (GtkAboutDialog *about)
 {
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
@@ -1211,7 +1211,7 @@ gtk_about_dialog_set_copyright (GtkAboutDialog *about,
  *
  * Since: 2.6
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_about_dialog_get_comments (GtkAboutDialog *about)
 {
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
@@ -1268,7 +1268,7 @@ gtk_about_dialog_set_comments (GtkAboutDialog *about,
  *
  * Since: 2.6
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_about_dialog_get_license (GtkAboutDialog *about)
 {
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
@@ -1379,7 +1379,7 @@ gtk_about_dialog_set_wrap_license (GtkAboutDialog *about,
  *
  * Since: 2.6
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_about_dialog_get_website (GtkAboutDialog *about)
 {
   GtkAboutDialogPrivate *priv;
@@ -1431,7 +1431,7 @@ gtk_about_dialog_set_website (GtkAboutDialog *about,
  *
  * Since: 2.6
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_about_dialog_get_website_label (GtkAboutDialog *about)
 {
   GtkAboutDialogPrivate *priv;
@@ -1485,7 +1485,7 @@ gtk_about_dialog_set_website_label (GtkAboutDialog *about,
  *
  * Since: 2.6
  */
-G_CONST_RETURN gchar * G_CONST_RETURN *
+const gchar * const *
 gtk_about_dialog_get_authors (GtkAboutDialog *about)
 {
   GtkAboutDialogPrivate *priv;
@@ -1540,7 +1540,7 @@ gtk_about_dialog_set_authors (GtkAboutDialog  *about,
  *
  * Since: 2.6
  */
-G_CONST_RETURN gchar * G_CONST_RETURN *
+const gchar * const *
 gtk_about_dialog_get_documenters (GtkAboutDialog *about)
 {
   GtkAboutDialogPrivate *priv;
@@ -1595,7 +1595,7 @@ gtk_about_dialog_set_documenters (GtkAboutDialog *about,
  *
  * Since: 2.6
  */
-G_CONST_RETURN gchar * G_CONST_RETURN *
+const gchar * const *
 gtk_about_dialog_get_artists (GtkAboutDialog *about)
 {
   GtkAboutDialogPrivate *priv;
@@ -1649,7 +1649,7 @@ gtk_about_dialog_set_artists (GtkAboutDialog *about,
  *
  * Since: 2.6
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_about_dialog_get_translator_credits (GtkAboutDialog *about)
 {
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
@@ -1805,7 +1805,7 @@ gtk_about_dialog_set_logo (GtkAboutDialog *about,
  *
  * Since: 2.6
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_about_dialog_get_logo_icon_name (GtkAboutDialog *about)
 {
   GtkAboutDialogPrivate *priv;
index 42eba5861d10e6d6465665e51f02ad8c862ffece..68c24d7b40e5b289d877d4d973f9a9ae29cfbccf 100644 (file)
@@ -112,19 +112,19 @@ GtkWidget             *gtk_about_dialog_new                    (void);
 void                   gtk_show_about_dialog                   (GtkWindow       *parent,
                                                                 const gchar     *first_property_name,
                                                                 ...) G_GNUC_NULL_TERMINATED;
-G_CONST_RETURN gchar  *gtk_about_dialog_get_program_name       (GtkAboutDialog  *about);
+const gchar *          gtk_about_dialog_get_program_name       (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_program_name       (GtkAboutDialog  *about,
                                                                 const gchar     *name);
-G_CONST_RETURN gchar  *gtk_about_dialog_get_version            (GtkAboutDialog  *about);
+const gchar *          gtk_about_dialog_get_version            (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_version            (GtkAboutDialog  *about,
                                                                 const gchar     *version);
-G_CONST_RETURN gchar  *gtk_about_dialog_get_copyright          (GtkAboutDialog  *about);
+const gchar *          gtk_about_dialog_get_copyright          (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_copyright          (GtkAboutDialog  *about,
                                                                 const gchar     *copyright);
-G_CONST_RETURN gchar  *gtk_about_dialog_get_comments           (GtkAboutDialog  *about);
+const gchar *          gtk_about_dialog_get_comments           (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_comments           (GtkAboutDialog  *about,
                                                                 const gchar     *comments);
-G_CONST_RETURN gchar  *gtk_about_dialog_get_license            (GtkAboutDialog  *about);
+const gchar *          gtk_about_dialog_get_license            (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_license            (GtkAboutDialog  *about,
                                                                 const gchar     *license);
 void                   gtk_about_dialog_set_license_type       (GtkAboutDialog  *about,
@@ -135,28 +135,28 @@ gboolean               gtk_about_dialog_get_wrap_license       (GtkAboutDialog
 void                   gtk_about_dialog_set_wrap_license       (GtkAboutDialog  *about,
                                                                 gboolean         wrap_license);
 
-G_CONST_RETURN gchar  *gtk_about_dialog_get_website            (GtkAboutDialog  *about);
+const gchar *          gtk_about_dialog_get_website            (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_website            (GtkAboutDialog  *about,
                                                                 const gchar     *website);
-G_CONST_RETURN gchar  *gtk_about_dialog_get_website_label      (GtkAboutDialog  *about);
+const gchar *          gtk_about_dialog_get_website_label      (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_website_label      (GtkAboutDialog  *about,
                                                                 const gchar     *website_label);
-G_CONST_RETURN gchar* G_CONST_RETURN * gtk_about_dialog_get_authors            (GtkAboutDialog  *about);
+const gchar* const *   gtk_about_dialog_get_authors            (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_authors            (GtkAboutDialog  *about,
                                                                 const gchar    **authors);
-G_CONST_RETURN gchar* G_CONST_RETURN * gtk_about_dialog_get_documenters        (GtkAboutDialog  *about);
+const gchar* const *   gtk_about_dialog_get_documenters        (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_documenters        (GtkAboutDialog  *about,
                                                                 const gchar    **documenters);
-G_CONST_RETURN gchar* G_CONST_RETURN * gtk_about_dialog_get_artists            (GtkAboutDialog  *about);
+const gchar* const *   gtk_about_dialog_get_artists            (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_artists            (GtkAboutDialog  *about,
                                                                 const gchar    **artists);
-G_CONST_RETURN gchar  *gtk_about_dialog_get_translator_credits (GtkAboutDialog  *about);
+const gchar *          gtk_about_dialog_get_translator_credits (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_translator_credits (GtkAboutDialog  *about,
                                                                 const gchar     *translator_credits);
 GdkPixbuf             *gtk_about_dialog_get_logo               (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_logo               (GtkAboutDialog  *about,
                                                                 GdkPixbuf       *logo);
-G_CONST_RETURN gchar  *gtk_about_dialog_get_logo_icon_name     (GtkAboutDialog  *about);
+const gchar *          gtk_about_dialog_get_logo_icon_name     (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_logo_icon_name     (GtkAboutDialog  *about,
                                                                 const gchar     *icon_name);
 
index 45a93a0ccf8ce6a378df9fb6d32d261234ae22d3..b1e4957609a7deabea0b4288e9e5e39b4b8bd7e1 100644 (file)
@@ -995,7 +995,7 @@ gtk_action_get_proxies (GtkAction *action)
  *
  * Since: 2.4
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_action_get_name (GtkAction *action)
 {
   g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
@@ -1292,7 +1292,7 @@ gtk_action_set_label (GtkAction     *action,
  *
  * Since: 2.16
  */
-G_CONST_RETURN gchar * 
+const gchar *
 gtk_action_get_label (GtkAction *action)
 {
   g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
@@ -1338,7 +1338,7 @@ gtk_action_set_short_label (GtkAction   *action,
  *
  * Since: 2.16
  */
-G_CONST_RETURN gchar * 
+const gchar *
 gtk_action_get_short_label (GtkAction *action)
 {
   g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
@@ -1470,7 +1470,7 @@ gtk_action_set_tooltip (GtkAction   *action,
  *
  * Since: 2.16
  */
-G_CONST_RETURN gchar * 
+const gchar *
 gtk_action_get_tooltip (GtkAction *action)
 {
   g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
@@ -1528,7 +1528,7 @@ gtk_action_set_stock_id (GtkAction   *action,
  *
  * Since: 2.16
  */
-G_CONST_RETURN gchar * 
+const gchar *
 gtk_action_get_stock_id (GtkAction *action)
 {
   g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
@@ -1570,7 +1570,7 @@ gtk_action_set_icon_name (GtkAction   *action,
  *
  * Since: 2.16
  */
-G_CONST_RETURN gchar * 
+const gchar *
 gtk_action_get_icon_name (GtkAction *action)
 {
   g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
@@ -1687,7 +1687,7 @@ gtk_action_set_accel_path (GtkAction   *action,
  *   if none is set. The returned string is owned by GTK+ 
  *   and must not be freed or modified.
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_action_get_accel_path (GtkAction *action)
 {
   g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
index c1212f2fd1c8bc399a2988dc41ed919224811a21..f60173ea89819dd8406d22fb71a21f53e239d703 100644 (file)
@@ -90,7 +90,7 @@ GtkAction   *gtk_action_new                    (const gchar *name,
                                                const gchar *label,
                                                const gchar *tooltip,
                                                const gchar *stock_id);
-G_CONST_RETURN gchar* gtk_action_get_name      (GtkAction     *action);
+const gchar* gtk_action_get_name               (GtkAction     *action);
 gboolean     gtk_action_is_sensitive           (GtkAction     *action);
 gboolean     gtk_action_get_sensitive          (GtkAction     *action);
 void         gtk_action_set_sensitive          (GtkAction     *action,
@@ -108,7 +108,7 @@ GtkWidget *  gtk_action_create_menu            (GtkAction     *action);
 GSList *     gtk_action_get_proxies            (GtkAction     *action);
 void         gtk_action_connect_accelerator    (GtkAction     *action);
 void         gtk_action_disconnect_accelerator (GtkAction     *action);
-G_CONST_RETURN gchar *gtk_action_get_accel_path (GtkAction     *action);
+const gchar *gtk_action_get_accel_path         (GtkAction     *action);
 GClosure    *gtk_action_get_accel_closure      (GtkAction     *action);
 void         gtk_action_block_activate         (GtkAction     *action);
 void         gtk_action_unblock_activate       (GtkAction     *action);
@@ -133,22 +133,22 @@ void         _gtk_action_sync_menu_visible     (GtkAction     *action,
 
 void                  gtk_action_set_label              (GtkAction   *action,
                                                          const gchar *label);
-G_CONST_RETURN gchar *gtk_action_get_label              (GtkAction   *action);
+const gchar *         gtk_action_get_label              (GtkAction   *action);
 void                  gtk_action_set_short_label        (GtkAction   *action,
                                                          const gchar *short_label);
-G_CONST_RETURN gchar *gtk_action_get_short_label        (GtkAction   *action);
+const gchar *         gtk_action_get_short_label        (GtkAction   *action);
 void                  gtk_action_set_tooltip            (GtkAction   *action,
                                                          const gchar *tooltip);
-G_CONST_RETURN gchar *gtk_action_get_tooltip            (GtkAction   *action);
+const gchar *         gtk_action_get_tooltip            (GtkAction   *action);
 void                  gtk_action_set_stock_id           (GtkAction   *action,
                                                          const gchar *stock_id);
-G_CONST_RETURN gchar *gtk_action_get_stock_id           (GtkAction   *action);
+const gchar *         gtk_action_get_stock_id           (GtkAction   *action);
 void                  gtk_action_set_gicon              (GtkAction   *action,
                                                          GIcon       *icon);
 GIcon                *gtk_action_get_gicon              (GtkAction   *action);
 void                  gtk_action_set_icon_name          (GtkAction   *action,
                                                          const gchar *icon_name);
-G_CONST_RETURN gchar *gtk_action_get_icon_name          (GtkAction   *action);
+const gchar *         gtk_action_get_icon_name          (GtkAction   *action);
 void                  gtk_action_set_visible_horizontal (GtkAction   *action,
                                                          gboolean     visible_horizontal);
 gboolean              gtk_action_get_visible_horizontal (GtkAction   *action);
index a3d1f5bc90535969fb5c154d5c3a9a141db195e4..cb16e44f0ec3ec30e6ab26d53bea867144069aba 100644 (file)
@@ -645,7 +645,7 @@ gtk_action_group_real_get_action (GtkActionGroup *self,
  * 
  * Since: 2.4
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_action_group_get_name (GtkActionGroup *action_group)
 {
   GtkActionGroupPrivate *private;
@@ -1442,7 +1442,7 @@ gtk_action_group_set_translation_domain (GtkActionGroup *action_group,
  *
  * Since: 2.6
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_action_group_translate_string (GtkActionGroup *action_group,
                                   const gchar    *string)
 {
index 33fa000dfac341d9ed5573b6d3137cfca280dfd8..aae24a86000c15e468a7654cb264b78791e87566 100644 (file)
@@ -160,7 +160,7 @@ struct _GtkRadioActionEntry
 
 GType           gtk_action_group_get_type                (void) G_GNUC_CONST;
 GtkActionGroup *gtk_action_group_new                     (const gchar                *name);
-G_CONST_RETURN gchar *gtk_action_group_get_name          (GtkActionGroup             *action_group);
+const gchar    *gtk_action_group_get_name                (GtkActionGroup             *action_group);
 gboolean        gtk_action_group_get_sensitive           (GtkActionGroup             *action_group);
 void            gtk_action_group_set_sensitive           (GtkActionGroup             *action_group,
                                                          gboolean                    sensitive);
@@ -214,7 +214,7 @@ void            gtk_action_group_set_translate_func      (GtkActionGroup
                                                          GDestroyNotify              notify);
 void            gtk_action_group_set_translation_domain  (GtkActionGroup             *action_group,
                                                          const gchar                *domain);
-G_CONST_RETURN gchar *gtk_action_group_translate_string  (GtkActionGroup             *action_group,
+const gchar *   gtk_action_group_translate_string        (GtkActionGroup             *action_group,
                                                          const gchar                *string);
 
 /* Protected for use by GtkAction */
index 6a466aac5b8250391b6a0af5ceb9e9150aa50f81..69fc67e1d01a650d792fbbc2d3049cb23e8220d5 100644 (file)
@@ -1793,7 +1793,7 @@ gtk_assistant_set_page_title (GtkAssistant *assistant,
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar*
+const gchar*
 gtk_assistant_get_page_title (GtkAssistant *assistant,
                               GtkWidget    *page)
 {
index e380f835ae794aec7e6ba2345850aff3ef584d1f..b1483691ff5a1247863a44129e76677561310a55 100644 (file)
@@ -151,7 +151,7 @@ GtkAssistantPageType  gtk_assistant_get_page_type         (GtkAssistant
 void                  gtk_assistant_set_page_title        (GtkAssistant         *assistant,
                                                            GtkWidget            *page,
                                                            const gchar          *title);
-G_CONST_RETURN gchar *gtk_assistant_get_page_title        (GtkAssistant         *assistant,
+const gchar *         gtk_assistant_get_page_title        (GtkAssistant         *assistant,
                                                            GtkWidget            *page);
 
 #if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
index c5ea7ed20ee4147614a2f15dcd2c6149cb763288..30726350944a36be6191a55244dac9a3e05b9329 100644 (file)
@@ -2032,7 +2032,7 @@ gtk_button_set_label (GtkButton   *button,
  * Return value: The text of the label widget. This string is owned
  * by the widget and must not be modified or freed.
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_button_get_label (GtkButton *button)
 {
   g_return_val_if_fail (GTK_IS_BUTTON (button), NULL);
index a373291b61542fd34b20e2e4aa3c3040ab74d0b3..997342edc9e8289825920557ba82cdf8f867e256 100644 (file)
@@ -96,7 +96,7 @@ void                  gtk_button_set_relief         (GtkButton      *button,
 GtkReliefStyle        gtk_button_get_relief         (GtkButton      *button);
 void                  gtk_button_set_label          (GtkButton      *button,
                                                     const gchar    *label);
-G_CONST_RETURN gchar *gtk_button_get_label          (GtkButton      *button);
+const gchar *         gtk_button_get_label          (GtkButton      *button);
 void                  gtk_button_set_use_underline  (GtkButton      *button,
                                                     gboolean        use_underline);
 gboolean              gtk_button_get_use_underline  (GtkButton      *button);
index 0af3c53df561594103f19085fa71876d290ec0bd..099c4e58b670017236616d79e045eaa2537be1c0 100644 (file)
@@ -2376,7 +2376,7 @@ gtk_cell_area_apply_attributes (GtkCellArea  *area,
  *
  * Since: 3.0
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_cell_area_get_current_path_string (GtkCellArea *area)
 {
   GtkCellAreaPrivate *priv;
index e2066054a8e6bf0140c24674f27a345a2e3457b4..7ae49a43f5858604db978b44ec84b21ee6e9c692 100644 (file)
@@ -353,7 +353,7 @@ void                  gtk_cell_area_get_preferred_width_for_height (GtkCellArea
                                                                     gint                height,
                                                                     gint               *minimum_width,
                                                                     gint               *natural_width);
-G_CONST_RETURN gchar *gtk_cell_area_get_current_path_string        (GtkCellArea        *area);
+const gchar *         gtk_cell_area_get_current_path_string        (GtkCellArea        *area);
 
 
 /* Attributes */
@@ -432,7 +432,7 @@ void                  gtk_cell_area_remove_focus_sibling           (GtkCellArea
 gboolean              gtk_cell_area_is_focus_sibling               (GtkCellArea          *area,
                                                                     GtkCellRenderer      *renderer,
                                                                     GtkCellRenderer      *sibling);
-G_CONST_RETURN GList *gtk_cell_area_get_focus_siblings             (GtkCellArea          *area,
+const GList *         gtk_cell_area_get_focus_siblings             (GtkCellArea          *area,
                                                                     GtkCellRenderer      *renderer);
 GtkCellRenderer      *gtk_cell_area_get_focus_from_sibling         (GtkCellArea          *area,
                                                                     GtkCellRenderer      *renderer);
index 472efddb6c5b9be83170479d50e2779fbaa69c07..5f13c54606711b76cd4406318863bd87f19fa886 100644 (file)
@@ -897,7 +897,7 @@ gtk_color_button_set_title (GtkColorButton *color_button,
  *
  * Since: 2.4
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_color_button_get_title (GtkColorButton *color_button)
 {
   g_return_val_if_fail (GTK_IS_COLOR_BUTTON (color_button), NULL);
index 98e7e8cf2052468ed65309e44d224a68abff9d53..7e1aae1a95ea356e8c202ee58ee41e2dcae78dc1 100644 (file)
@@ -93,7 +93,7 @@ void       gtk_color_button_get_rgba       (GtkColorButton *color_button,
                                             GdkRGBA        *rgba);
 void       gtk_color_button_set_title      (GtkColorButton *color_button,
                                             const gchar    *title);
-G_CONST_RETURN gchar *gtk_color_button_get_title (GtkColorButton *color_button);
+const gchar *gtk_color_button_get_title    (GtkColorButton *color_button);
 
 
 G_END_DECLS
index b123de876473f335019005791001d2c6701cd275..8a74f8f1a68b51495abe942ca2ee061170ff2fd8 100644 (file)
@@ -4835,7 +4835,7 @@ gtk_combo_box_set_add_tearoffs (GtkComboBox *combo_box,
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar*
+const gchar*
 gtk_combo_box_get_title (GtkComboBox *combo_box)
 {
   g_return_val_if_fail (GTK_IS_COMBO_BOX (combo_box), NULL);
index 6156659c97b99344e3db801aba1cc1f9f3c12f99..776d1b74be9bbf5f64bd6ad160c0416ff9b42151 100644 (file)
@@ -88,8 +88,8 @@ gboolean      gtk_combo_box_get_add_tearoffs       (GtkComboBox *combo_box);
 void          gtk_combo_box_set_add_tearoffs       (GtkComboBox *combo_box,
                                                     gboolean     add_tearoffs);
 
-G_CONST_RETURN gchar *gtk_combo_box_get_title      (GtkComboBox *combo_box);
-void                  gtk_combo_box_set_title      (GtkComboBox *combo_box,
+const gchar * gtk_combo_box_get_title              (GtkComboBox *combo_box);
+void          gtk_combo_box_set_title              (GtkComboBox *combo_box,
                                                     const gchar *title);
 
 gboolean      gtk_combo_box_get_focus_on_click     (GtkComboBox *combo);
index 677de09dfc5d30bf77e385a3506f2c2f819ce8d5..0e2d931b307e24540beaa294b88892c88e5c6fb2 100644 (file)
@@ -7271,7 +7271,7 @@ gtk_entry_get_overwrite_mode (GtkEntry *entry)
  *      storage in the widget and must not be freed, modified or
  *      stored.
  **/
-G_CONST_RETURN gchar*
+const gchar*
 gtk_entry_get_text (GtkEntry *entry)
 {
   g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL);
@@ -7536,7 +7536,7 @@ gtk_entry_set_inner_border (GtkEntry        *entry,
  *
  * Since: 2.10
  **/
-G_CONST_RETURN GtkBorder *
+const GtkBorder *
 gtk_entry_get_inner_border (GtkEntry *entry)
 {
   g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL);
@@ -10354,7 +10354,7 @@ gtk_entry_set_placeholder_text (GtkEntry    *entry,
  *
  * Since: 3.2
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_entry_get_placeholder_text (GtkEntry *entry)
 {
   GtkEntryPrivate *priv;
index 2bca50159235383a330612f553faf42911b660c5..605d2939628a843d70a9adc04c99ed935cd154ba 100644 (file)
@@ -149,9 +149,9 @@ void       gtk_entry_set_has_frame              (GtkEntry      *entry,
                                                  gboolean       setting);
 gboolean   gtk_entry_get_has_frame              (GtkEntry      *entry);
 
-void       gtk_entry_set_inner_border                (GtkEntry        *entry,
-                                                      const GtkBorder *border);
-G_CONST_RETURN GtkBorder* gtk_entry_get_inner_border (GtkEntry        *entry);
+void             gtk_entry_set_inner_border     (GtkEntry        *entry,
+                                                 const GtkBorder *border);
+const GtkBorder* gtk_entry_get_inner_border     (GtkEntry        *entry);
 
 void       gtk_entry_set_overwrite_mode         (GtkEntry      *entry,
                                                  gboolean       overwrite);
@@ -176,7 +176,7 @@ gint       gtk_entry_get_width_chars            (GtkEntry      *entry);
 void       gtk_entry_set_text                   (GtkEntry      *entry,
                                                  const gchar   *text);
 /* returns a reference to the text */
-G_CONST_RETURN gchar* gtk_entry_get_text        (GtkEntry      *entry);
+const gchar* gtk_entry_get_text        (GtkEntry      *entry);
 
 PangoLayout* gtk_entry_get_layout               (GtkEntry      *entry);
 void         gtk_entry_get_layout_offsets       (GtkEntry      *entry,
@@ -213,10 +213,10 @@ gdouble        gtk_entry_get_progress_pulse_step (GtkEntry     *entry);
 
 void           gtk_entry_progress_pulse          (GtkEntry     *entry);
 
-G_CONST_RETURN gchar* gtk_entry_get_placeholder_text     (GtkEntry             *entry);
+const gchar*   gtk_entry_get_placeholder_text    (GtkEntry             *entry);
 
-void           gtk_entry_set_placeholder_text            (GtkEntry             *entry,
-                                                          const gchar          *text);
+void           gtk_entry_set_placeholder_text    (GtkEntry             *entry,
+                                                  const gchar          *text);
 /* Setting and managing icons
  */
 void           gtk_entry_set_icon_from_pixbuf            (GtkEntry             *entry,
index bd05b8275e5126191df5423abe748fe3d908754d..5968a1a68db6be34b1277b5e78610da094fd4a3f 100644 (file)
@@ -519,7 +519,7 @@ gtk_entry_buffer_get_bytes (GtkEntryBuffer *buffer)
  *
  * Since: 2.18
  **/
-G_CONST_RETURN gchar*
+const gchar*
 gtk_entry_buffer_get_text (GtkEntryBuffer *buffer)
 {
   GtkEntryBufferClass *klass;
index 00e24c32bd9863f770bc9e761a1a12d3ddf257c8..2378c6875672e7503fa6aaf387b52b7df6ba2574 100644 (file)
@@ -101,7 +101,7 @@ gsize                     gtk_entry_buffer_get_bytes              (GtkEntryBuffe
 
 guint                     gtk_entry_buffer_get_length             (GtkEntryBuffer  *buffer);
 
-G_CONST_RETURN gchar*     gtk_entry_buffer_get_text               (GtkEntryBuffer  *buffer);
+const gchar*              gtk_entry_buffer_get_text               (GtkEntryBuffer  *buffer);
 
 void                      gtk_entry_buffer_set_text               (GtkEntryBuffer  *buffer,
                                                                    const gchar     *chars,
index 2bfc6c87961dee802f195fc5bc8fd6ce7243d818..2c33a1ac158f528e561f12b5c3c2c366545a110f 100644 (file)
@@ -1864,7 +1864,7 @@ gtk_expander_set_label (GtkExpander *expander,
  *
  * Since: 2.4
  */
-G_CONST_RETURN char *
+const char *
 gtk_expander_get_label (GtkExpander *expander)
 {
   GtkExpanderPrivate *priv;
index 4a1b813d8525aba7db211c2a497e018502fa48a8..c88be57c5b71c3bf2ea44e11fcbc64fecd1978a8 100644 (file)
@@ -82,7 +82,7 @@ gint                  gtk_expander_get_spacing         (GtkExpander *expander);
 
 void                  gtk_expander_set_label           (GtkExpander *expander,
                                                         const gchar *label);
-G_CONST_RETURN gchar *gtk_expander_get_label           (GtkExpander *expander);
+const gchar *         gtk_expander_get_label           (GtkExpander *expander);
 
 void                  gtk_expander_set_use_underline   (GtkExpander *expander,
                                                         gboolean     use_underline);
index f3ede0cf83f6ecb9e3f7c0e21261d097d579d464..2abc11304f267ee6578acbf23528d0a1034d2448 100644 (file)
@@ -2822,7 +2822,7 @@ gtk_file_chooser_button_set_title (GtkFileChooserButton *button,
  * 
  * Since: 2.6
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_file_chooser_button_get_title (GtkFileChooserButton *button)
 {
   g_return_val_if_fail (GTK_IS_FILE_CHOOSER_BUTTON (button), NULL);
index fb0cee19dcd6febb2c2a7498fa6dd128b26eac93..7742c98b0c576fbee50803ddad41e7b6b4405c6f 100644 (file)
@@ -68,7 +68,7 @@ GType                 gtk_file_chooser_button_get_type         (void) G_GNUC_CON
 GtkWidget *           gtk_file_chooser_button_new              (const gchar          *title,
                                                                GtkFileChooserAction  action);
 GtkWidget *           gtk_file_chooser_button_new_with_dialog  (GtkWidget            *dialog);
-G_CONST_RETURN gchar *gtk_file_chooser_button_get_title        (GtkFileChooserButton *button);
+const gchar *         gtk_file_chooser_button_get_title        (GtkFileChooserButton *button);
 void                  gtk_file_chooser_button_set_title        (GtkFileChooserButton *button,
                                                                const gchar          *title);
 gint                  gtk_file_chooser_button_get_width_chars  (GtkFileChooserButton *button);
index 5754979f7fe260c51d82a357caa1119f5af98eed..4fdc6246333dc6c839faf0e09fd41113e76a9443 100644 (file)
@@ -404,7 +404,7 @@ gtk_file_filter_set_name (GtkFileFilter *filter,
  * 
  * Since: 2.4
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_file_filter_get_name (GtkFileFilter *filter)
 {
   g_return_val_if_fail (GTK_IS_FILE_FILTER (filter), NULL);
index 02e277557deeb59621a6aa6f5c8947fc914a6a09..c723199f4a62e4f42f22187408b2f48df19ef884 100644 (file)
@@ -96,7 +96,7 @@ GType gtk_file_filter_get_type (void) G_GNUC_CONST;
 GtkFileFilter *       gtk_file_filter_new      (void);
 void                  gtk_file_filter_set_name (GtkFileFilter *filter,
                                                const gchar   *name);
-G_CONST_RETURN gchar *gtk_file_filter_get_name (GtkFileFilter *filter);
+const gchar *         gtk_file_filter_get_name (GtkFileFilter *filter);
 
 void gtk_file_filter_add_mime_type      (GtkFileFilter      *filter,
                                         const gchar        *mime_type);
index e3ba766c04bd5739c7555b5c18d06bc7932aa7d3..a1b1e13200dec82ba7bc754b362e7ee10728489d 100644 (file)
@@ -438,7 +438,7 @@ gtk_font_button_set_title (GtkFontButton *font_button,
  *
  * Since: 2.4
  */
-G_CONST_RETURN gchar*
+const gchar*
 gtk_font_button_get_title (GtkFontButton *font_button)
 {
   g_return_val_if_fail (GTK_IS_FONT_BUTTON (font_button), NULL);
@@ -650,7 +650,7 @@ gtk_font_button_set_show_size (GtkFontButton *font_button,
  *
  * Since: 2.4
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_font_button_get_font_name (GtkFontButton *font_button)
 {
   g_return_val_if_fail (GTK_IS_FONT_BUTTON (font_button), NULL);
index bc64767d8d2a5f4cf15f6aea15e8fec6adb6b762..79d60457ad6ccb7702755f2124e323abd661e1f1 100644 (file)
@@ -75,7 +75,7 @@ GType                 gtk_font_button_get_type       (void) G_GNUC_CONST;
 GtkWidget            *gtk_font_button_new            (void);
 GtkWidget            *gtk_font_button_new_with_font  (const gchar   *fontname);
 
-G_CONST_RETURN gchar *gtk_font_button_get_title      (GtkFontButton *font_button);
+const gchar *         gtk_font_button_get_title      (GtkFontButton *font_button);
 void                  gtk_font_button_set_title      (GtkFontButton *font_button,
                                                       const gchar   *title);
 gboolean              gtk_font_button_get_use_font   (GtkFontButton *font_button);
@@ -84,7 +84,7 @@ void                  gtk_font_button_set_use_font   (GtkFontButton *font_button
 gboolean              gtk_font_button_get_use_size   (GtkFontButton *font_button);
 void                  gtk_font_button_set_use_size   (GtkFontButton *font_button,
                                                       gboolean       use_size);
-G_CONST_RETURN gchar* gtk_font_button_get_font_name  (GtkFontButton *font_button);
+const gchar *         gtk_font_button_get_font_name  (GtkFontButton *font_button);
 gboolean              gtk_font_button_set_font_name  (GtkFontButton *font_button,
                                                       const gchar   *fontname);
 gboolean              gtk_font_button_get_show_style (GtkFontButton *font_button);
index 7885899752cf97b927a6166c6013359b878c4758..4beed4c2ce41b6252787dcf85e8ee105b0dcfe56 100644 (file)
@@ -1563,7 +1563,7 @@ gtk_font_selection_set_font_name (GtkFontSelection *fontsel,
  *     This string is owned by the widget and should not be 
  *     modified or freed 
  */
-G_CONST_RETURN gchar*
+const gchar*
 gtk_font_selection_get_preview_text (GtkFontSelection *fontsel)
 {
   GtkFontSelectionPrivate *priv;
@@ -1868,7 +1868,7 @@ gtk_font_selection_dialog_set_font_name (GtkFontSelectionDialog *fsd,
  *     This string is owned by the widget and should not be 
  *     modified or freed 
  */
-G_CONST_RETURN gchar*
+const gchar*
 gtk_font_selection_dialog_get_preview_text (GtkFontSelectionDialog *fsd)
 {
   GtkFontSelectionDialogPrivate *priv;
index 1bf2907847ca7897c2fce36fc4a1d00daf891727..f9e60f8e52a208a980eb73311637e4f6b59423df 100644 (file)
@@ -161,7 +161,7 @@ gboolean   gtk_font_selection_dialog_set_font_name     (GtkFontSelectionDialog *
 
 /* This returns the text in the preview entry. You should copy the returned
    text if you need it. */
-G_CONST_RETURN gchar* 
+const gchar*
           gtk_font_selection_dialog_get_preview_text   (GtkFontSelectionDialog *fsd);
 
 /* This sets the text in the preview entry. It will be copied by the entry,
index f0a42ed9532639815093a08a2a951f1d3cf9c736..f63de8091e4dcefc2bb9ad8b495106f7c59e3dd7 100644 (file)
@@ -432,7 +432,7 @@ gtk_frame_set_label (GtkFrame *frame,
  *               a #GtkLabel. This string is owned by GTK+ and
  *               must not be modified or freed.
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_frame_get_label (GtkFrame *frame)
 {
   GtkFramePrivate *priv;
index d8485f109aef7c31af548e54596269b8459a9d4b..04b06006e7128b4701743feeb941b24a55115577 100644 (file)
@@ -74,9 +74,9 @@ struct _GtkFrameClass
 GType      gtk_frame_get_type         (void) G_GNUC_CONST;
 GtkWidget* gtk_frame_new              (const gchar   *label);
 
-void                  gtk_frame_set_label (GtkFrame    *frame,
-                                          const gchar *label);
-G_CONST_RETURN gchar *gtk_frame_get_label (GtkFrame    *frame);
+void          gtk_frame_set_label (GtkFrame    *frame,
+                                   const gchar *label);
+const gchar * gtk_frame_get_label (GtkFrame    *frame);
 
 void       gtk_frame_set_label_widget (GtkFrame      *frame,
                                       GtkWidget     *label_widget);
index 2d5902c62242390937b7568b6a754f293ea8d51c..c17feef5d9fe4600e6701dec367150b579f7c028 100644 (file)
@@ -1171,7 +1171,7 @@ gtk_icon_size_from_name (const gchar *name)
  * Gets the canonical name of the given icon size. The returned string
  * is statically allocated and should not be freed.
  */
-G_CONST_RETURN gchar*
+const gchar*
 gtk_icon_size_get_name (GtkIconSize  size)
 {
   if (size >= icon_sizes_used)
@@ -2210,7 +2210,7 @@ gtk_icon_source_set_pixbuf (GtkIconSource *source,
  * Return value: (type filename): image filename. This string must not
  * be modified or freed.
  */
-G_CONST_RETURN gchar*
+const gchar*
 gtk_icon_source_get_filename (const GtkIconSource *source)
 {
   g_return_val_if_fail (source != NULL, NULL);
@@ -2231,7 +2231,7 @@ gtk_icon_source_get_filename (const GtkIconSource *source)
  *
  * Return value: icon name. This string must not be modified or freed.
  */
-G_CONST_RETURN gchar*
+const gchar*
 gtk_icon_source_get_icon_name (const GtkIconSource *source)
 {
   g_return_val_if_fail (source != NULL, NULL);
index 1faf7b73cdda183ecc7f256b7eee2f750e42e12a..17b0c92651dfc1695ddb49ead3754942737ee5e8 100644 (file)
@@ -109,7 +109,7 @@ GtkIconSize           gtk_icon_size_register       (const gchar *name,
 void                  gtk_icon_size_register_alias (const gchar *alias,
                                                     GtkIconSize  target);
 GtkIconSize           gtk_icon_size_from_name      (const gchar *name);
-G_CONST_RETURN gchar* gtk_icon_size_get_name       (GtkIconSize  size);
+const gchar*          gtk_icon_size_get_name       (GtkIconSize  size);
 
 /* Icon sets */
 
@@ -153,9 +153,9 @@ void           gtk_icon_source_set_icon_name            (GtkIconSource       *so
 void           gtk_icon_source_set_pixbuf               (GtkIconSource       *source,
                                                          GdkPixbuf           *pixbuf);
 
-G_CONST_RETURN gchar* gtk_icon_source_get_filename  (const GtkIconSource *source);
-G_CONST_RETURN gchar* gtk_icon_source_get_icon_name (const GtkIconSource *source);
-GdkPixbuf*            gtk_icon_source_get_pixbuf    (const GtkIconSource *source);
+const gchar *    gtk_icon_source_get_filename             (const GtkIconSource *source);
+const gchar *    gtk_icon_source_get_icon_name            (const GtkIconSource *source);
+GdkPixbuf*       gtk_icon_source_get_pixbuf               (const GtkIconSource *source);
 
 void             gtk_icon_source_set_direction_wildcarded (GtkIconSource       *source,
                                                            gboolean             setting);
index ad55d02537c4286650fab94ae6ff282fe13facb7..cdebec327a5099572c9c7465653de643c0747225 100644 (file)
@@ -2765,7 +2765,7 @@ gtk_icon_info_get_base_size (GtkIconInfo *icon_info)
  *
  * Since: 2.4
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_icon_info_get_filename (GtkIconInfo *icon_info)
 {
   g_return_val_if_fail (icon_info != NULL, NULL);
@@ -3641,7 +3641,7 @@ gtk_icon_info_get_attach_points (GtkIconInfo *icon_info,
  *
  * Since: 2.4
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_icon_info_get_display_name (GtkIconInfo *icon_info)
 {
   g_return_val_if_fail (icon_info != NULL, NULL);
index 6d3ea2d266a44242196c49e4d35b74ec85a116cd..43363a11b4d3f03c2c343be5738ab46bafd266fd 100644 (file)
@@ -196,7 +196,7 @@ GtkIconInfo *         gtk_icon_info_new_for_pixbuf     (GtkIconTheme  *icon_them
                                                         GdkPixbuf     *pixbuf);
 
 gint                  gtk_icon_info_get_base_size      (GtkIconInfo   *icon_info);
-G_CONST_RETURN gchar *gtk_icon_info_get_filename       (GtkIconInfo   *icon_info);
+const gchar *         gtk_icon_info_get_filename       (GtkIconInfo   *icon_info);
 GdkPixbuf *           gtk_icon_info_get_builtin_pixbuf (GtkIconInfo   *icon_info);
 GdkPixbuf *           gtk_icon_info_load_icon          (GtkIconInfo   *icon_info,
                                                        GError       **error);
@@ -226,7 +226,7 @@ gboolean              gtk_icon_info_get_embedded_rect (GtkIconInfo    *icon_info
 gboolean              gtk_icon_info_get_attach_points (GtkIconInfo    *icon_info,
                                                       GdkPoint      **points,
                                                       gint           *n_points);
-G_CONST_RETURN gchar *gtk_icon_info_get_display_name  (GtkIconInfo    *icon_info);
+const gchar *         gtk_icon_info_get_display_name  (GtkIconInfo    *icon_info);
 
 /* Non-public methods */
 void _gtk_icon_theme_check_reload                     (GdkDisplay *display);
index 1c9c0a3d0726d83cc40e47cb80683b17a59ef373..821f98c8387dc942f1bdb16c8685a9a46938a9fd 100644 (file)
@@ -1258,9 +1258,9 @@ gtk_image_get_animation (GtkImage *image)
  * Since: 2.6
  **/
 void
-gtk_image_get_icon_name  (GtkImage              *image,
-                         G_CONST_RETURN gchar **icon_name,
-                         GtkIconSize           *size)
+gtk_image_get_icon_name  (GtkImage     *image,
+                         const gchar **icon_name,
+                         GtkIconSize  *size)
 {
   GtkImagePrivate *priv;
 
index bdd74e7058b52acfc9907bc440d6159670cb2e52..ec8d243f940b0813b28106ed3c9a92ae1f741685 100644 (file)
@@ -154,9 +154,9 @@ void       gtk_image_get_icon_set (GtkImage         *image,
                                    GtkIconSet      **icon_set,
                                    GtkIconSize      *size);
 GdkPixbufAnimation* gtk_image_get_animation (GtkImage *image);
-void       gtk_image_get_icon_name (GtkImage              *image,
-                                   G_CONST_RETURN gchar **icon_name,
-                                   GtkIconSize           *size);
+void       gtk_image_get_icon_name (GtkImage     *image,
+                                   const gchar **icon_name,
+                                   GtkIconSize  *size);
 void       gtk_image_get_gicon     (GtkImage              *image,
                                    GIcon                **gicon,
                                    GtkIconSize           *size);
index 69fea65bbaa7c90ed496886d863f65fe8c783d5e..480df828ead5fc76799fdec493d2ce76870d8c3a 100644 (file)
@@ -93,7 +93,7 @@ static void gtk_image_menu_item_toggle_size_request  (GtkMenuItem      *menu_ite
                                                       gint             *requisition);
 static void gtk_image_menu_item_set_label            (GtkMenuItem      *menu_item,
                                                       const gchar      *label);
-static G_CONST_RETURN gchar *gtk_image_menu_item_get_label (GtkMenuItem *menu_item);
+static const gchar * gtk_image_menu_item_get_label   (GtkMenuItem *menu_item);
 
 static void gtk_image_menu_item_forall               (GtkContainer    *container,
                                                       gboolean         include_internals,
@@ -424,7 +424,7 @@ gtk_image_menu_item_set_label (GtkMenuItem      *menu_item,
     }
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 gtk_image_menu_item_get_label (GtkMenuItem *menu_item)
 {
   GtkImageMenuItemPrivate *priv = GTK_IMAGE_MENU_ITEM (menu_item)->priv;
index 71a61558b2e112429ce06e57bcbea60ae95cdba6..685429d9be7d666321c50d1fe74a7f12e4493600 100644 (file)
@@ -2265,7 +2265,7 @@ gtk_label_set_label (GtkLabel    *label,
  * Return value: the text of the label widget. This string is
  *   owned by the widget and must not be modified or freed.
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_label_get_label (GtkLabel *label)
 {
   g_return_val_if_fail (GTK_IS_LABEL (label), NULL);
@@ -2730,7 +2730,7 @@ gtk_label_set_markup_with_mnemonic (GtkLabel    *label,
  * Return value: the text in the label widget. This is the internal
  *   string used by the label, and must not be modified.
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_label_get_text (GtkLabel *label)
 {
   g_return_val_if_fail (GTK_IS_LABEL (label), NULL);
@@ -6531,7 +6531,7 @@ gtk_label_get_current_link (GtkLabel *label)
  *
  * Since: 2.18
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_label_get_current_uri (GtkLabel *label)
 {
   GtkLabelLink *link;
index 9085005a150f1f61eb7dd739033f77126b9a2836..f22c84df79c714eb9e491b9dcef88da48e6b3e94 100644 (file)
@@ -93,13 +93,13 @@ GtkWidget*            gtk_label_new               (const gchar   *str);
 GtkWidget*            gtk_label_new_with_mnemonic (const gchar   *str);
 void                  gtk_label_set_text          (GtkLabel      *label,
                                                   const gchar   *str);
-G_CONST_RETURN gchar* gtk_label_get_text          (GtkLabel      *label);
+const gchar*          gtk_label_get_text          (GtkLabel      *label);
 void                  gtk_label_set_attributes    (GtkLabel      *label,
                                                   PangoAttrList *attrs);
 PangoAttrList        *gtk_label_get_attributes    (GtkLabel      *label);
 void                  gtk_label_set_label         (GtkLabel      *label,
                                                   const gchar   *str);
-G_CONST_RETURN gchar *gtk_label_get_label         (GtkLabel      *label);
+const gchar *         gtk_label_get_label         (GtkLabel      *label);
 void                  gtk_label_set_markup        (GtkLabel      *label,
                                                   const gchar   *str);
 void                  gtk_label_set_use_markup    (GtkLabel      *label,
@@ -159,7 +159,7 @@ void         gtk_label_set_single_line_mode  (GtkLabel *label,
                                               gboolean single_line_mode);
 gboolean     gtk_label_get_single_line_mode  (GtkLabel *label);
 
-G_CONST_RETURN gchar *gtk_label_get_current_uri (GtkLabel *label);
+const gchar *gtk_label_get_current_uri (GtkLabel *label);
 void         gtk_label_set_track_visited_links  (GtkLabel *label,
                                                  gboolean  track_links);
 gboolean     gtk_label_get_track_visited_links  (GtkLabel *label);
index 2c76adea76b4504b2ec99745871960c7ab4c7a21..b98972fe62cd6e716d1e6b5a75007561d0a05e3b 100644 (file)
@@ -752,7 +752,7 @@ gtk_link_button_set_uri (GtkLinkButton *link_button,
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_link_button_get_uri (GtkLinkButton *link_button)
 {
   g_return_val_if_fail (GTK_IS_LINK_BUTTON (link_button), NULL);
index 06e361677d4304567e809de4baab436a26ddf531..1f74477befdde4f0cb7d2c808a5a4c07e7eaf834 100644 (file)
@@ -87,7 +87,7 @@ GtkWidget *           gtk_link_button_new               (const gchar   *uri);
 GtkWidget *           gtk_link_button_new_with_label    (const gchar   *uri,
                                                         const gchar   *label);
 
-G_CONST_RETURN gchar *gtk_link_button_get_uri           (GtkLinkButton *link_button);
+const gchar *         gtk_link_button_get_uri           (GtkLinkButton *link_button);
 void                  gtk_link_button_set_uri           (GtkLinkButton *link_button,
                                                         const gchar   *uri);
 
index 5cf965b12c55ec0d3e3238147d344c236e3c5b7c..3dbbc049b5bc9537511e11bc7dc726948e57e063 100644 (file)
@@ -2408,7 +2408,7 @@ gtk_menu_set_title (GtkMenu     *menu,
  *     has no title set on it. This string is owned by GTK+
  *     and should not be modified or freed.
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_menu_get_title (GtkMenu *menu)
 {
   g_return_val_if_fail (GTK_IS_MENU (menu), NULL);
index 5f49dfbb47053dc0da00c874626d97e18c592e4c..fb5e1970a262d6a7e8fbccb5cd4688dc00096ea3 100644 (file)
@@ -182,9 +182,9 @@ gboolean   gtk_menu_get_tearoff_state     (GtkMenu             *menu);
 /* This sets the window manager title for the window that
  * appears when a menu is torn off
  */
-void       gtk_menu_set_title             (GtkMenu             *menu,
-                                          const gchar         *title);
-G_CONST_RETURN gchar *gtk_menu_get_title  (GtkMenu             *menu);
+void          gtk_menu_set_title          (GtkMenu             *menu,
+                                           const gchar         *title);
+const gchar * gtk_menu_get_title          (GtkMenu             *menu);
 
 void       gtk_menu_reorder_child         (GtkMenu             *menu,
                                            GtkWidget           *child,
index ea19152c6c4b08ebcfc1831542477d46bb0efbac..1537e84713829e70dea5bacd2c82c63f33bbc7a2 100644 (file)
@@ -155,7 +155,7 @@ static gboolean gtk_menu_item_can_activate_accel (GtkWidget *widget,
 
 static void gtk_real_menu_item_set_label (GtkMenuItem     *menu_item,
                                           const gchar     *label);
-static G_CONST_RETURN gchar * gtk_real_menu_item_get_label (GtkMenuItem *menu_item);
+static const gchar * gtk_real_menu_item_get_label (GtkMenuItem *menu_item);
 
 static void gtk_menu_item_get_preferred_width            (GtkWidget           *widget,
                                                           gint                *minimum_size,
@@ -1893,7 +1893,7 @@ gtk_real_menu_item_set_label (GtkMenuItem *menu_item,
     }
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 gtk_real_menu_item_get_label (GtkMenuItem *menu_item)
 {
   GtkWidget *child;
@@ -2521,7 +2521,7 @@ gtk_menu_item_set_accel_path (GtkMenuItem *menu_item,
  *
  * Since: 2.14
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_menu_item_get_accel_path (GtkMenuItem *menu_item)
 {
   g_return_val_if_fail (GTK_IS_MENU_ITEM (menu_item), NULL);
@@ -2604,7 +2604,7 @@ gtk_menu_item_set_label (GtkMenuItem *menu_item,
  *
  * Since: 2.16
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_menu_item_get_label (GtkMenuItem *menu_item)
 {
   g_return_val_if_fail (GTK_IS_MENU_ITEM (menu_item), NULL);
index 26d86b7af8b281c9c37894eb2659300caa9110e5..50eb5710886d458a9762f40a9fa96e20596b3232 100644 (file)
@@ -76,7 +76,7 @@ struct _GtkMenuItemClass
                                  gint         allocation);
   void (* set_label)            (GtkMenuItem *menu_item,
                                  const gchar *label);
-  G_CONST_RETURN gchar *(* get_label) (GtkMenuItem *menu_item);
+  const gchar * (* get_label)   (GtkMenuItem *menu_item);
 
   void (* select)               (GtkMenuItem *menu_item);
   void (* deselect)             (GtkMenuItem *menu_item);
@@ -109,13 +109,13 @@ void       gtk_menu_item_set_right_justified  (GtkMenuItem         *menu_item,
                                                gboolean             right_justified);
 gboolean   gtk_menu_item_get_right_justified  (GtkMenuItem         *menu_item);
 #endif  /* GTK_DISABLE_DEPRECATED */
-void       gtk_menu_item_set_accel_path       (GtkMenuItem         *menu_item,
+void          gtk_menu_item_set_accel_path    (GtkMenuItem         *menu_item,
                                                const gchar         *accel_path);
-G_CONST_RETURN gchar* gtk_menu_item_get_accel_path (GtkMenuItem    *menu_item);
+const gchar * gtk_menu_item_get_accel_path    (GtkMenuItem    *menu_item);
 
-void       gtk_menu_item_set_label            (GtkMenuItem         *menu_item,
+void          gtk_menu_item_set_label         (GtkMenuItem         *menu_item,
                                                const gchar         *label);
-G_CONST_RETURN gchar *gtk_menu_item_get_label (GtkMenuItem         *menu_item);
+const gchar * gtk_menu_item_get_label         (GtkMenuItem         *menu_item);
 
 void       gtk_menu_item_set_use_underline    (GtkMenuItem         *menu_item,
                                                gboolean             setting);
index 8cb21a70db3545a8edb8084568df40cd79fe5bb3..7b44f82655a6255a3ef454d5b329b182335eba51 100644 (file)
@@ -7665,7 +7665,7 @@ gtk_notebook_set_tab_label_text (GtkNotebook *notebook,
  *     tab label widget is not a #GtkLabel. The string is owned
  *     by the widget and must not be freed.
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_notebook_get_tab_label_text (GtkNotebook *notebook,
                                  GtkWidget   *child)
 {
@@ -7803,7 +7803,7 @@ gtk_notebook_set_menu_label_text (GtkNotebook *notebook,
  *     menu label, or the menu label widget is not a #GtkLabel.
  *     The string is owned by the widget and must not be freed.
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_notebook_get_menu_label_text (GtkNotebook *notebook,
                                   GtkWidget *child)
 {
index d69d4f0835c5e4e0b33c72a0a104f6064e0a39ee..9fe962e3dd77b6aed35fd2a1f0b9b44cf1592c93 100644 (file)
@@ -212,20 +212,20 @@ GtkWidget * gtk_notebook_get_tab_label    (GtkNotebook *notebook,
 void gtk_notebook_set_tab_label           (GtkNotebook *notebook,
                                           GtkWidget   *child,
                                           GtkWidget   *tab_label);
-void gtk_notebook_set_tab_label_text      (GtkNotebook *notebook,
-                                          GtkWidget   *child,
-                                          const gchar *tab_text);
-G_CONST_RETURN gchar *gtk_notebook_get_tab_label_text (GtkNotebook *notebook,
-                                                      GtkWidget   *child);
+void          gtk_notebook_set_tab_label_text (GtkNotebook *notebook,
+                                               GtkWidget   *child,
+                                               const gchar *tab_text);
+const gchar * gtk_notebook_get_tab_label_text (GtkNotebook *notebook,
+                                               GtkWidget   *child);
 GtkWidget * gtk_notebook_get_menu_label   (GtkNotebook *notebook,
                                           GtkWidget   *child);
 void gtk_notebook_set_menu_label          (GtkNotebook *notebook,
                                           GtkWidget   *child,
                                           GtkWidget   *menu_label);
-void gtk_notebook_set_menu_label_text     (GtkNotebook *notebook,
-                                          GtkWidget   *child,
-                                          const gchar *menu_text);
-G_CONST_RETURN gchar *gtk_notebook_get_menu_label_text (GtkNotebook *notebook,
+void          gtk_notebook_set_menu_label_text (GtkNotebook *notebook,
+                                                GtkWidget   *child,
+                                                const gchar *menu_text);
+const gchar * gtk_notebook_get_menu_label_text (GtkNotebook *notebook,
                                                        GtkWidget   *child);
 void gtk_notebook_reorder_child           (GtkNotebook *notebook,
                                           GtkWidget   *child,
index 23017eaf7326a6f52efe40f2af74e24f23b133a4..06852c0a05a8076425b0447e9571811bb2bc94df 100644 (file)
@@ -516,7 +516,7 @@ gtk_paper_size_get_paper_sizes (gboolean include_custom)
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_paper_size_get_name (GtkPaperSize *size)
 {
   if (size->name)
@@ -535,7 +535,7 @@ gtk_paper_size_get_name (GtkPaperSize *size)
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_paper_size_get_display_name (GtkPaperSize *size)
 {
   const gchar *display_name;
@@ -560,7 +560,7 @@ gtk_paper_size_get_display_name (GtkPaperSize *size)
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_paper_size_get_ppd_name (GtkPaperSize *size)
 {
   if (size->ppd_name)
@@ -660,7 +660,7 @@ gtk_paper_size_set_size (GtkPaperSize *size,
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_paper_size_get_default (void)
 {
   char *locale, *freeme = NULL;
index 864eb3818e5bca14842f01263c2849606a740aef..0cdb8ae122071ed443891d88c62ab4531dbc5040 100644 (file)
@@ -105,9 +105,9 @@ gboolean      gtk_paper_size_is_equal     (GtkPaperSize *size1,
 GList        *gtk_paper_size_get_paper_sizes (gboolean include_custom);
 
 /* The width is always the shortest side, measure in mm */
-G_CONST_RETURN gchar *gtk_paper_size_get_name         (GtkPaperSize *size);
-G_CONST_RETURN gchar *gtk_paper_size_get_display_name (GtkPaperSize *size);
-G_CONST_RETURN gchar *gtk_paper_size_get_ppd_name     (GtkPaperSize *size);
+const gchar *gtk_paper_size_get_name         (GtkPaperSize *size);
+const gchar *gtk_paper_size_get_display_name (GtkPaperSize *size);
+const gchar *gtk_paper_size_get_ppd_name     (GtkPaperSize *size);
 
 gdouble  gtk_paper_size_get_width        (GtkPaperSize *size, GtkUnit unit);
 gdouble  gtk_paper_size_get_height       (GtkPaperSize *size, GtkUnit unit);
@@ -128,7 +128,7 @@ gdouble gtk_paper_size_get_default_left_margin   (GtkPaperSize *size,
 gdouble gtk_paper_size_get_default_right_margin  (GtkPaperSize *size,
                                                  GtkUnit       unit);
 
-G_CONST_RETURN gchar *gtk_paper_size_get_default (void);
+const gchar *gtk_paper_size_get_default (void);
 
 GtkPaperSize *gtk_paper_size_new_from_key_file (GKeyFile    *key_file,
                                                const gchar *group_name,
index 95df2f0792722857e5ff0d4f74c569c45e7cb364..d6ac906371bf7d371a11e8e2309b72e6de308c59 100644 (file)
@@ -436,7 +436,7 @@ gtk_printer_get_backend (GtkPrinter *printer)
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_printer_get_name (GtkPrinter *printer)
 {
   g_return_val_if_fail (GTK_IS_PRINTER (printer), NULL);
@@ -454,7 +454,7 @@ gtk_printer_get_name (GtkPrinter *printer)
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_printer_get_description (GtkPrinter *printer)
 {
   g_return_val_if_fail (GTK_IS_PRINTER (printer), NULL);
@@ -492,7 +492,7 @@ gtk_printer_set_description (GtkPrinter  *printer,
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_printer_get_state_message (GtkPrinter *printer)
 {
   g_return_val_if_fail (GTK_IS_PRINTER (printer), NULL);
@@ -530,7 +530,7 @@ gtk_printer_set_state_message (GtkPrinter  *printer,
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_printer_get_location (GtkPrinter *printer)
 {
   g_return_val_if_fail (GTK_IS_PRINTER (printer), NULL);
@@ -568,7 +568,7 @@ gtk_printer_set_location (GtkPrinter  *printer,
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar * 
+const gchar *
 gtk_printer_get_icon_name (GtkPrinter *printer)
 {
   g_return_val_if_fail (GTK_IS_PRINTER (printer), NULL);
index a9e8736d1c2b0cddc0e2677c14d38d1161d3d7eb..595db5230513b0855da7bce70315911b1883220a 100644 (file)
@@ -117,11 +117,11 @@ GtkPrinter              *gtk_printer_new                   (const gchar     *nam
                                                            GtkPrintBackend *backend,
                                                            gboolean         virtual_);
 GtkPrintBackend         *gtk_printer_get_backend           (GtkPrinter      *printer);
-G_CONST_RETURN gchar    *gtk_printer_get_name              (GtkPrinter      *printer);
-G_CONST_RETURN gchar    *gtk_printer_get_state_message     (GtkPrinter      *printer);
-G_CONST_RETURN gchar    *gtk_printer_get_description       (GtkPrinter      *printer);
-G_CONST_RETURN gchar    *gtk_printer_get_location          (GtkPrinter      *printer);
-G_CONST_RETURN gchar    *gtk_printer_get_icon_name         (GtkPrinter      *printer);
+const gchar *            gtk_printer_get_name              (GtkPrinter      *printer);
+const gchar *            gtk_printer_get_state_message     (GtkPrinter      *printer);
+const gchar *            gtk_printer_get_description       (GtkPrinter      *printer);
+const gchar *            gtk_printer_get_location          (GtkPrinter      *printer);
+const gchar *            gtk_printer_get_icon_name         (GtkPrinter      *printer);
 gint                     gtk_printer_get_job_count         (GtkPrinter      *printer);
 gboolean                 gtk_printer_is_active             (GtkPrinter      *printer);
 gboolean                 gtk_printer_is_paused             (GtkPrinter      *printer);
index 58d339778d0c4e0da54ac066036765cc1028439e..bb9a2126f153adce7c9d031c4ca64fa3883d440d 100644 (file)
@@ -376,7 +376,7 @@ gtk_print_job_get_printer (GtkPrintJob *job)
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_print_job_get_title (GtkPrintJob *job)
 {
   g_return_val_if_fail (GTK_IS_PRINT_JOB (job), NULL);
index d09004a63f1875468c1e6e0629e4895945b0c125..3851e40eaacd7af4cad668b2a990ef340683b20d 100644 (file)
@@ -85,7 +85,7 @@ GtkPrintJob             *gtk_print_job_new                    (const gchar
                                                               GtkPageSetup             *page_setup);
 GtkPrintSettings        *gtk_print_job_get_settings           (GtkPrintJob              *job);
 GtkPrinter              *gtk_print_job_get_printer            (GtkPrintJob              *job);
-G_CONST_RETURN gchar    *gtk_print_job_get_title              (GtkPrintJob              *job);
+const gchar *            gtk_print_job_get_title              (GtkPrintJob              *job);
 GtkPrintStatus           gtk_print_job_get_status             (GtkPrintJob              *job);
 gboolean                 gtk_print_job_set_source_file        (GtkPrintJob              *job,
                                                               const gchar              *filename,
index ff950035708ecfd5c20f59d4d85e7c18b97c659a..ebc7ad4565746c905bcd30947f38d16700469bec 100644 (file)
@@ -1833,7 +1833,7 @@ gtk_print_operation_get_status (GtkPrintOperation *op)
  *
  * Since: 2.10
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_print_operation_get_status_string (GtkPrintOperation *op)
 {
   g_return_val_if_fail (GTK_IS_PRINT_OPERATION (op), "");
index c0ee030ec3f8b8e451213f27c09ce0e667ccc5aa..4d51e4d81c54b76631f5ce672d7838d97fddd3d9 100644 (file)
@@ -236,7 +236,7 @@ GtkPrintOperationResult gtk_print_operation_run                    (GtkPrintOper
 void                    gtk_print_operation_get_error              (GtkPrintOperation  *op,
                                                                     GError            **error);
 GtkPrintStatus          gtk_print_operation_get_status             (GtkPrintOperation  *op);
-G_CONST_RETURN gchar *  gtk_print_operation_get_status_string      (GtkPrintOperation  *op);
+const gchar *           gtk_print_operation_get_status_string      (GtkPrintOperation  *op);
 gboolean                gtk_print_operation_is_finished            (GtkPrintOperation  *op);
 void                    gtk_print_operation_cancel                 (GtkPrintOperation  *op);
 void                    gtk_print_operation_draw_page_finish       (GtkPrintOperation  *op);
index cf60c9329d02702dee8fa700a0519a9c1f089099..4871a116549e1b5aa72c50f3040b6bf0599e2814 100644 (file)
@@ -169,7 +169,7 @@ gtk_print_settings_copy (GtkPrintSettings *other)
  * 
  * Since: 2.10
  */
-G_CONST_RETURN gchar *        
+const gchar *
 gtk_print_settings_get (GtkPrintSettings *settings,
                        const gchar      *key)
 {
@@ -524,7 +524,7 @@ gtk_print_settings_foreach (GtkPrintSettings    *settings,
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *       
+const gchar *
 gtk_print_settings_get_printer (GtkPrintSettings *settings)
 {
   return gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_PRINTER);
@@ -1540,7 +1540,7 @@ gtk_print_settings_set_page_ranges  (GtkPrintSettings *settings,
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_print_settings_get_default_source (GtkPrintSettings *settings)
 {
   return gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_DEFAULT_SOURCE);
@@ -1575,7 +1575,7 @@ gtk_print_settings_set_default_source (GtkPrintSettings *settings,
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_print_settings_get_media_type (GtkPrintSettings *settings)
 {
   return gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_MEDIA_TYPE);
@@ -1610,7 +1610,7 @@ gtk_print_settings_set_media_type (GtkPrintSettings *settings,
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_print_settings_get_dither (GtkPrintSettings *settings)
 {
   return gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_DITHER);
@@ -1674,7 +1674,7 @@ gtk_print_settings_set_finishings (GtkPrintSettings *settings,
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_print_settings_get_output_bin (GtkPrintSettings *settings)
 {
   return gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_OUTPUT_BIN);
index 02b6073466ad8d6393401f1de83fefa6b3a6e098..af35f3b0978ef97adb549170dba6105124267dc3 100644 (file)
@@ -71,7 +71,7 @@ void              gtk_print_settings_to_key_file             (GtkPrintSettings
                                                              const gchar          *group_name);
 gboolean          gtk_print_settings_has_key                 (GtkPrintSettings     *settings,
                                                              const gchar          *key);
-G_CONST_RETURN gchar *gtk_print_settings_get                 (GtkPrintSettings     *settings,
+const gchar *     gtk_print_settings_get                     (GtkPrintSettings     *settings,
                                                              const gchar          *key);
 void              gtk_print_settings_set                     (GtkPrintSettings     *settings,
                                                              const gchar          *key,
@@ -159,7 +159,7 @@ void              gtk_print_settings_set_int                 (GtkPrintSettings
 
 /* Helpers: */
 
-G_CONST_RETURN gchar *gtk_print_settings_get_printer           (GtkPrintSettings   *settings);
+const gchar *         gtk_print_settings_get_printer           (GtkPrintSettings   *settings);
 void                  gtk_print_settings_set_printer           (GtkPrintSettings   *settings,
                                                                const gchar        *printer);
 GtkPageOrientation    gtk_print_settings_get_orientation       (GtkPrintSettings   *settings);
@@ -227,19 +227,19 @@ void                  gtk_print_settings_set_page_ranges       (GtkPrintSettings
 GtkPageSet            gtk_print_settings_get_page_set          (GtkPrintSettings   *settings);
 void                  gtk_print_settings_set_page_set          (GtkPrintSettings   *settings,
                                                                GtkPageSet          page_set);
-G_CONST_RETURN gchar *gtk_print_settings_get_default_source    (GtkPrintSettings   *settings);
+const gchar *         gtk_print_settings_get_default_source    (GtkPrintSettings   *settings);
 void                  gtk_print_settings_set_default_source    (GtkPrintSettings   *settings,
                                                                const gchar        *default_source);
-G_CONST_RETURN gchar *gtk_print_settings_get_media_type        (GtkPrintSettings   *settings);
+const gchar *         gtk_print_settings_get_media_type        (GtkPrintSettings   *settings);
 void                  gtk_print_settings_set_media_type        (GtkPrintSettings   *settings,
                                                                const gchar        *media_type);
-G_CONST_RETURN gchar *gtk_print_settings_get_dither            (GtkPrintSettings   *settings);
+const gchar *         gtk_print_settings_get_dither            (GtkPrintSettings   *settings);
 void                  gtk_print_settings_set_dither            (GtkPrintSettings   *settings,
                                                                const gchar        *dither);
-G_CONST_RETURN gchar *gtk_print_settings_get_finishings        (GtkPrintSettings   *settings);
+const gchar *         gtk_print_settings_get_finishings        (GtkPrintSettings   *settings);
 void                  gtk_print_settings_set_finishings        (GtkPrintSettings   *settings,
                                                                const gchar        *finishings);
-G_CONST_RETURN gchar *gtk_print_settings_get_output_bin        (GtkPrintSettings   *settings);
+const gchar *         gtk_print_settings_get_output_bin        (GtkPrintSettings   *settings);
 void                  gtk_print_settings_set_output_bin        (GtkPrintSettings   *settings,
                                                                const gchar        *output_bin);
 
index 46e9aa42b7d40a859cbf7f1b04d37064ba06e5e0..aa1f28dd0bd89741faf8428af2ad995c61d544ea 100644 (file)
@@ -1245,7 +1245,7 @@ gtk_progress_bar_set_inverted (GtkProgressBar *pbar,
  * Return value: text, or %NULL; this string is owned by the widget
  * and should not be modified or freed.
  **/
-G_CONST_RETURN gchar*
+const gchar*
 gtk_progress_bar_get_text (GtkProgressBar *pbar)
 {
   g_return_val_if_fail (GTK_IS_PROGRESS_BAR (pbar), NULL);
index be14b7c66e1c14c93ab449884533d9642dee2a5d..b64181384a84983728d2ddb1781a50d786ecb8f8 100644 (file)
@@ -81,9 +81,9 @@ void       gtk_progress_bar_set_pulse_step       (GtkProgressBar *pbar,
 void       gtk_progress_bar_set_inverted         (GtkProgressBar *pbar,
                                                   gboolean        inverted);
 
-G_CONST_RETURN gchar* gtk_progress_bar_get_text       (GtkProgressBar *pbar);
-gdouble               gtk_progress_bar_get_fraction   (GtkProgressBar *pbar);
-gdouble               gtk_progress_bar_get_pulse_step (GtkProgressBar *pbar);
+const gchar *      gtk_progress_bar_get_text       (GtkProgressBar *pbar);
+gdouble            gtk_progress_bar_get_fraction   (GtkProgressBar *pbar);
+gdouble            gtk_progress_bar_get_pulse_step (GtkProgressBar *pbar);
 
 gboolean           gtk_progress_bar_get_inverted    (GtkProgressBar *pbar);
 void               gtk_progress_bar_set_ellipsize (GtkProgressBar     *pbar,
index fbdc88c333d840f74e261d2c4e85c2c0ce9856e6..07a4a0a6b81ed9af42ad4e92f3492104b8248842 100644 (file)
@@ -458,7 +458,7 @@ gtk_recent_filter_set_name (GtkRecentFilter *filter,
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_recent_filter_get_name (GtkRecentFilter *filter)
 {
   g_return_val_if_fail (GTK_IS_RECENT_FILTER (filter), NULL);
index ad3fd099035a5d4a849e538d0f6c2bc202eeb70a..163fcc5b91320de33c6845822329c22599d0a5b9 100644 (file)
@@ -99,7 +99,7 @@ GType                 gtk_recent_filter_get_type (void) G_GNUC_CONST;
 GtkRecentFilter *     gtk_recent_filter_new      (void);
 void                  gtk_recent_filter_set_name (GtkRecentFilter *filter,
                                                  const gchar     *name);
-G_CONST_RETURN gchar *gtk_recent_filter_get_name (GtkRecentFilter *filter);
+const gchar *         gtk_recent_filter_get_name (GtkRecentFilter *filter);
 
 void gtk_recent_filter_add_mime_type      (GtkRecentFilter      *filter,
                                           const gchar          *mime_type);
index a33b58a012f7d25be43dd606fa767057c557df55..dbe83fa975a321b00baa02d49809156b1ecd0509 100644 (file)
@@ -1539,7 +1539,7 @@ gtk_recent_info_unref (GtkRecentInfo *info)
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_recent_info_get_uri (GtkRecentInfo *info)
 {
   g_return_val_if_fail (info != NULL, NULL);
@@ -1559,7 +1559,7 @@ gtk_recent_info_get_uri (GtkRecentInfo *info)
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_recent_info_get_display_name (GtkRecentInfo *info)
 {
   g_return_val_if_fail (info != NULL, NULL);
@@ -1581,7 +1581,7 @@ gtk_recent_info_get_display_name (GtkRecentInfo *info)
  *
  * Since: 2.10
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_recent_info_get_description (GtkRecentInfo *info)
 {
   g_return_val_if_fail (info != NULL, NULL);
@@ -1600,7 +1600,7 @@ gtk_recent_info_get_description (GtkRecentInfo *info)
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_recent_info_get_mime_type (GtkRecentInfo *info)
 {
   g_return_val_if_fail (info != NULL, NULL);
index 41e7c841ba30dd11b7115161166f55f2ec3b90cd..6d7bda6f4d563a63961be0279f1f0704c1ddccbb 100644 (file)
@@ -191,10 +191,10 @@ GType                   gtk_recent_info_get_type             (void) G_GNUC_CONST;
 GtkRecentInfo *       gtk_recent_info_ref                  (GtkRecentInfo  *info);
 void                  gtk_recent_info_unref                (GtkRecentInfo  *info);
 
-G_CONST_RETURN gchar *gtk_recent_info_get_uri              (GtkRecentInfo  *info);
-G_CONST_RETURN gchar *gtk_recent_info_get_display_name     (GtkRecentInfo  *info);
-G_CONST_RETURN gchar *gtk_recent_info_get_description      (GtkRecentInfo  *info);
-G_CONST_RETURN gchar *gtk_recent_info_get_mime_type        (GtkRecentInfo  *info);
+const gchar *         gtk_recent_info_get_uri              (GtkRecentInfo  *info);
+const gchar *         gtk_recent_info_get_display_name     (GtkRecentInfo  *info);
+const gchar *         gtk_recent_info_get_description      (GtkRecentInfo  *info);
+const gchar *         gtk_recent_info_get_mime_type        (GtkRecentInfo  *info);
 time_t                gtk_recent_info_get_added            (GtkRecentInfo  *info);
 time_t                gtk_recent_info_get_modified         (GtkRecentInfo  *info);
 time_t                gtk_recent_info_get_visited          (GtkRecentInfo  *info);
index fe99b1ee92e75c82bca8bc29438d82a889f35e01..1722d0278a2432d8c9160e7a514a9af4b658a513 100644 (file)
@@ -63,7 +63,7 @@ typedef enum
 static gboolean (*beagle_client_send_request_async) (BeagleClient   *client,
                                                     BeagleRequest  *request,
                                                     GError        **err) = NULL;
-static G_CONST_RETURN char *(*beagle_hit_get_uri) (BeagleHit *hit) = NULL;
+static const char *(*beagle_hit_get_uri) (BeagleHit *hit) = NULL;
 static GSList *(*beagle_hits_added_response_get_hits) (BeagleHitsAddedResponse *response) = NULL;
 static GSList *(*beagle_hits_subtracted_response_get_uris) (BeagleHitsSubtractedResponse *response) = NULL;
 static BeagleQuery *(*beagle_query_new) (void) = NULL;
index aa37454d42fb9718559dcc2762aac6ab9204fb7c..6e53bc9f7118fe958938d615ca0b21346fe140c0 100644 (file)
@@ -2135,7 +2135,7 @@ gtk_status_icon_get_pixbuf (GtkStatusIcon *status_icon)
  *
  * Since: 2.10
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_status_icon_get_stock (GtkStatusIcon *status_icon)
 {
   GtkStatusIconPrivate *priv;
@@ -2167,7 +2167,7 @@ gtk_status_icon_get_stock (GtkStatusIcon *status_icon)
  *
  * Since: 2.10
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_status_icon_get_icon_name (GtkStatusIcon *status_icon)
 {
   GtkStatusIconPrivate *priv;
@@ -2920,7 +2920,7 @@ gtk_status_icon_set_title (GtkStatusIcon *status_icon,
  *
  * Since: 2.18
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_status_icon_get_title (GtkStatusIcon *status_icon)
 {
   GtkStatusIconPrivate *priv;
index 5508066cac477843dabff11e195194aa033315da..758ed0a9fadb816db01a19674bc5b35fb43c7281 100644 (file)
@@ -102,8 +102,8 @@ void                  gtk_status_icon_set_from_gicon     (GtkStatusIcon      *st
 GtkImageType          gtk_status_icon_get_storage_type   (GtkStatusIcon      *status_icon);
 
 GdkPixbuf            *gtk_status_icon_get_pixbuf         (GtkStatusIcon      *status_icon);
-G_CONST_RETURN gchar *gtk_status_icon_get_stock          (GtkStatusIcon      *status_icon);
-G_CONST_RETURN gchar *gtk_status_icon_get_icon_name      (GtkStatusIcon      *status_icon);
+const gchar *         gtk_status_icon_get_stock          (GtkStatusIcon      *status_icon);
+const gchar *         gtk_status_icon_get_icon_name      (GtkStatusIcon      *status_icon);
 GIcon                *gtk_status_icon_get_gicon          (GtkStatusIcon      *status_icon);
 
 gint                  gtk_status_icon_get_size           (GtkStatusIcon      *status_icon);
@@ -120,7 +120,7 @@ void                  gtk_status_icon_set_tooltip_markup (GtkStatusIcon      *st
                                                           const gchar        *markup);
 void                  gtk_status_icon_set_title          (GtkStatusIcon      *status_icon,
                                                           const gchar        *title);
-G_CONST_RETURN gchar *gtk_status_icon_get_title          (GtkStatusIcon      *status_icon);
+const gchar *         gtk_status_icon_get_title          (GtkStatusIcon      *status_icon);
 void                  gtk_status_icon_set_name           (GtkStatusIcon      *status_icon,
                                                           const gchar        *name);
 void                  gtk_status_icon_set_visible        (GtkStatusIcon      *status_icon,
index aad8e222487e11314bf751305ce5fe265fd67c06..762f889e8accfd55617d4916f430fac633b8914d 100644 (file)
@@ -1695,7 +1695,7 @@ gtk_style_context_set_path (GtkStyleContext *context,
  *
  * Since: 3.0
  **/
-G_CONST_RETURN GtkWidgetPath *
+const GtkWidgetPath *
 gtk_style_context_get_path (GtkStyleContext *context)
 {
   GtkStyleContextPrivate *priv;
index 8d8f51153fffe6d762b25e1159eeaf6889e8b75a..4e3d4d5ed945938749074cdb42fc1c6f8c9db178 100644 (file)
@@ -563,7 +563,7 @@ gboolean      gtk_style_context_state_is_running (GtkStyleContext *context,
 
 void          gtk_style_context_set_path     (GtkStyleContext *context,
                                               GtkWidgetPath   *path);
-G_CONST_RETURN GtkWidgetPath * gtk_style_context_get_path (GtkStyleContext *context);
+const GtkWidgetPath * gtk_style_context_get_path (GtkStyleContext *context);
 
 GList *  gtk_style_context_list_classes (GtkStyleContext *context);
 
index 8b714bc25e72c4ee77cdfeaaa24a9c4f3331e9a4..3e45d3cd408bdd57dd404b7adc57bb8eac8b74a2 100644 (file)
@@ -93,7 +93,7 @@ void                  gtk_text_mark_set_visible      (GtkTextMark *mark,
                                                       gboolean     setting);
 gboolean              gtk_text_mark_get_visible      (GtkTextMark *mark);
 
-G_CONST_RETURN gchar* gtk_text_mark_get_name         (GtkTextMark *mark);
+const gchar *         gtk_text_mark_get_name         (GtkTextMark *mark);
 gboolean              gtk_text_mark_get_deleted      (GtkTextMark *mark);
 GtkTextBuffer*        gtk_text_mark_get_buffer       (GtkTextMark *mark);
 gboolean              gtk_text_mark_get_left_gravity (GtkTextMark *mark);
index 68520a0160f368568251ac6464247a80c7774edc..dc59928c68d43a0c0be32a9ec9756d664e107bec 100644 (file)
@@ -638,7 +638,7 @@ gtk_theming_engine_state_is_running (GtkThemingEngine *engine,
  *
  * Since: 3.0
  **/
-G_CONST_RETURN GtkWidgetPath *
+const GtkWidgetPath *
 gtk_theming_engine_get_path (GtkThemingEngine *engine)
 {
   GtkThemingEnginePrivate *priv;
index 148bbd277317442e4bf02a614cf5be554c57bb87..63c792c1fde65d457e5cc0aa3eb558610ed4fe45 100644 (file)
@@ -211,7 +211,7 @@ gboolean gtk_theming_engine_lookup_color (GtkThemingEngine *engine,
                                           const gchar      *color_name,
                                           GdkRGBA          *color);
 
-G_CONST_RETURN GtkWidgetPath * gtk_theming_engine_get_path (GtkThemingEngine *engine);
+const GtkWidgetPath * gtk_theming_engine_get_path (GtkThemingEngine *engine);
 
 gboolean gtk_theming_engine_has_class  (GtkThemingEngine *engine,
                                         const gchar      *style_class);
index ddf321b09b913db2a90b2fda2655aa74eb0cb79e..f78572985a410a595489e36cca7055fbf62dc4fc 100644 (file)
@@ -1051,7 +1051,7 @@ gtk_tool_button_set_label (GtkToolButton *button,
  * 
  * Since: 2.4
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_tool_button_get_label (GtkToolButton *button)
 {
   g_return_val_if_fail (GTK_IS_TOOL_BUTTON (button), NULL);
@@ -1152,7 +1152,7 @@ gtk_tool_button_set_stock_id (GtkToolButton *button,
  * 
  * Since: 2.4
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_tool_button_get_stock_id (GtkToolButton *button)
 {
   g_return_val_if_fail (GTK_IS_TOOL_BUTTON (button), NULL);
@@ -1203,7 +1203,7 @@ gtk_tool_button_set_icon_name (GtkToolButton *button,
  * 
  * Since: 2.8
  **/
-G_CONST_RETURN gchar*
+const gchar*
 gtk_tool_button_get_icon_name (GtkToolButton *button)
 {
   g_return_val_if_fail (GTK_IS_TOOL_BUTTON (button), NULL);
index 3783e70657373ade904e2fd4b5e0e224dfc07d88..eba864536a3a4851c8d2517abdb28b6ed6140111 100644 (file)
@@ -73,16 +73,16 @@ GtkToolItem *gtk_tool_button_new_from_stock (const gchar *stock_id);
 
 void                  gtk_tool_button_set_label         (GtkToolButton *button,
                                                         const gchar   *label);
-G_CONST_RETURN gchar *gtk_tool_button_get_label         (GtkToolButton *button);
+const gchar *         gtk_tool_button_get_label         (GtkToolButton *button);
 void                  gtk_tool_button_set_use_underline (GtkToolButton *button,
                                                         gboolean       use_underline);
 gboolean              gtk_tool_button_get_use_underline (GtkToolButton *button);
 void                  gtk_tool_button_set_stock_id      (GtkToolButton *button,
                                                         const gchar   *stock_id);
-G_CONST_RETURN gchar *gtk_tool_button_get_stock_id      (GtkToolButton *button);
+const gchar *         gtk_tool_button_get_stock_id      (GtkToolButton *button);
 void                  gtk_tool_button_set_icon_name     (GtkToolButton *button,
                                                         const gchar   *icon_name);
-G_CONST_RETURN gchar *gtk_tool_button_get_icon_name     (GtkToolButton *button);
+const gchar *         gtk_tool_button_get_icon_name     (GtkToolButton *button);
 void                  gtk_tool_button_set_icon_widget   (GtkToolButton *button,
                                                         GtkWidget     *icon_widget);
 GtkWidget *           gtk_tool_button_get_icon_widget   (GtkToolButton *button);
index 20981baa34b84c95bd9d7314e7f9e752342a32d8..018b32b28af904c5713a665a76be8ae4a352da6d 100644 (file)
@@ -1980,7 +1980,7 @@ gtk_tool_item_group_set_ellipsize (GtkToolItemGroup   *group,
  *
  * Since: 2.20
  */
-G_CONST_RETURN gchar*
+const gchar*
 gtk_tool_item_group_get_label (GtkToolItemGroup *group)
 {
   GtkToolItemGroupPrivate *priv;
index 1024bc046c6b185cc35ce01484176a644a5458c0..1d7852eae67f3aac520a1e83055d0c15189b255f 100644 (file)
@@ -78,7 +78,7 @@ void                  gtk_tool_item_group_set_ellipsize     (GtkToolItemGroup
 void                  gtk_tool_item_group_set_header_relief (GtkToolItemGroup   *group,
                                                              GtkReliefStyle      style);
 
-G_CONST_RETURN gchar* gtk_tool_item_group_get_label         (GtkToolItemGroup   *group);
+const gchar *         gtk_tool_item_group_get_label         (GtkToolItemGroup   *group);
 GtkWidget            *gtk_tool_item_group_get_label_widget  (GtkToolItemGroup   *group);
 gboolean              gtk_tool_item_group_get_collapsed     (GtkToolItemGroup   *group);
 PangoEllipsizeMode    gtk_tool_item_group_get_ellipsize     (GtkToolItemGroup   *group);
index 907c989c1cc0e9d5321e93fc308d505d8658fd27..e0084fab125caff863913c275be5bd291c290042 100644 (file)
@@ -1881,7 +1881,7 @@ _gtk_tool_palette_child_set_drag_source (GtkWidget *child,
  *
  * Since: 2.20
  */
-G_CONST_RETURN GtkTargetEntry*
+const GtkTargetEntry*
 gtk_tool_palette_get_drag_target_item (void)
 {
   return &dnd_targets[0];
@@ -1896,7 +1896,7 @@ gtk_tool_palette_get_drag_target_item (void)
  *
  * Since: 2.20
  */
-G_CONST_RETURN GtkTargetEntry*
+const GtkTargetEntry*
 gtk_tool_palette_get_drag_target_group (void)
 {
   return &dnd_targets[1];
index 7870c55967cd2e7b9ed074112919da46568ea0d0..a8e3ddeda96893329ba111a5ee796004a1c5ac63 100644 (file)
@@ -133,8 +133,8 @@ GtkAdjustment*                 gtk_tool_palette_get_vadjustment       (GtkToolPa
 
 #endif
 
-G_CONST_RETURN GtkTargetEntry* gtk_tool_palette_get_drag_target_item  (void) G_GNUC_CONST;
-G_CONST_RETURN GtkTargetEntry* gtk_tool_palette_get_drag_target_group (void) G_GNUC_CONST;
+const GtkTargetEntry*          gtk_tool_palette_get_drag_target_item  (void) G_GNUC_CONST;
+const GtkTargetEntry*          gtk_tool_palette_get_drag_target_group (void) G_GNUC_CONST;
 
 
 G_END_DECLS
index c97f8e55d3dce5a9b53baf77f24c332a6b6e369d..11f86cd1d65d11909f684f9afde479430c0856c9 100644 (file)
@@ -2412,7 +2412,7 @@ gtk_tree_view_column_set_title (GtkTreeViewColumn *tree_column,
  * Return value: the title of the column. This string should not be
  * modified or freed.
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_tree_view_column_get_title (GtkTreeViewColumn *tree_column)
 {
   g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), NULL);
index c6b2e792aece4e303af3ae940ac0942a039602e8..2635fd860cc726b772386b41594ca7790958311d 100644 (file)
@@ -161,7 +161,7 @@ void                    gtk_tree_view_column_clicked             (GtkTreeViewCol
  */
 void                    gtk_tree_view_column_set_title           (GtkTreeViewColumn       *tree_column,
                                                                  const gchar             *title);
-G_CONST_RETURN gchar   *gtk_tree_view_column_get_title           (GtkTreeViewColumn       *tree_column);
+const gchar *           gtk_tree_view_column_get_title           (GtkTreeViewColumn       *tree_column);
 void                    gtk_tree_view_column_set_expand          (GtkTreeViewColumn       *tree_column,
                                                                  gboolean                 expand);
 gboolean                gtk_tree_view_column_get_expand          (GtkTreeViewColumn       *tree_column);
index 17ebd4447b1a550db562fce4b474096453908970..caeec32450bf44a35bd8df73fdc2de327da95694 100644 (file)
@@ -6964,7 +6964,7 @@ gtk_widget_set_name (GtkWidget     *widget,
  * Return value: name of the widget. This string is owned by GTK+ and
  * should not be modified or freed
  **/
-G_CONST_RETURN gchar*
+const gchar*
 gtk_widget_get_name (GtkWidget *widget)
 {
   GtkWidgetPrivate *priv;
index 739e9111f49116ea72ac835ba70a29278c4237cc..064152112afc2dc7bb70bd172fb74774cd368247 100644 (file)
@@ -578,7 +578,7 @@ gboolean   gtk_widget_device_is_shadowed  (GtkWidget           *widget,
 
 void                  gtk_widget_set_name               (GtkWidget    *widget,
                                                         const gchar  *name);
-G_CONST_RETURN gchar* gtk_widget_get_name               (GtkWidget    *widget);
+const gchar *         gtk_widget_get_name               (GtkWidget    *widget);
 
 void                  gtk_widget_set_state              (GtkWidget    *widget,
                                                         GtkStateType  state);
index c6f3fb3c1b11357f99aaa8ae77606836fa5a409c..bdbb7d0b2d4c237d7cd2a03a4aa8ae7fdea0b279 100644 (file)
@@ -578,7 +578,7 @@ gtk_widget_path_iter_set_object_type (GtkWidgetPath *path,
  *
  * Returns: The widget name, or %NULL if none was set.
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_widget_path_iter_get_name (const GtkWidgetPath *path,
                                gint                 pos)
 {
index 66441fa3a14be3b3189ab04f1a3cf7ae4c40ad66..0ff9b76e165a529e3c976f95431080e65719f06e 100644 (file)
@@ -70,7 +70,7 @@ const GtkWidgetPath *
 guint               gtk_widget_path_iter_get_sibling_index(const GtkWidgetPath *path,
                                                            gint                 pos);
 
-G_CONST_RETURN gchar * gtk_widget_path_iter_get_name  (const GtkWidgetPath *path,
+const gchar *          gtk_widget_path_iter_get_name  (const GtkWidgetPath *path,
                                                        gint                 pos);
 void                   gtk_widget_path_iter_set_name  (GtkWidgetPath       *path,
                                                        gint                 pos,
index 76d029edac9cce0bb87b9a1d72fa15d5de78ae7b..31877d28618d43e004f22efa75856d830f894a12 100644 (file)
@@ -1584,7 +1584,7 @@ gtk_window_set_title (GtkWindow   *window,
  *    been set explicitely. The returned string is owned by the widget
  *    and must not be modified or freed.
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_window_get_title (GtkWindow *window)
 {
   g_return_val_if_fail (GTK_IS_WINDOW (window), NULL);
@@ -1746,7 +1746,7 @@ gtk_window_set_startup_id (GtkWindow   *window,
  *   returned is owned by the widget and must not be modified
  *   or freed.
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_window_get_role (GtkWindow *window)
 {
   g_return_val_if_fail (GTK_IS_WINDOW (window), NULL);
index 38200702870fe0a21846cc561e74f1cd1f03290e..2752d8daed89abdbca605e4f9a0fb716ab57b1eb 100644 (file)
@@ -108,7 +108,7 @@ GType      gtk_window_get_type                 (void) G_GNUC_CONST;
 GtkWidget* gtk_window_new                      (GtkWindowType        type);
 void       gtk_window_set_title                (GtkWindow           *window,
                                                const gchar         *title);
-G_CONST_RETURN gchar *gtk_window_get_title     (GtkWindow           *window);
+const gchar * gtk_window_get_title             (GtkWindow           *window);
 void       gtk_window_set_wmclass              (GtkWindow           *window,
                                                const gchar         *wmclass_name,
                                                const gchar         *wmclass_class);
@@ -116,7 +116,7 @@ void       gtk_window_set_role                 (GtkWindow           *window,
                                                 const gchar         *role);
 void       gtk_window_set_startup_id           (GtkWindow           *window,
                                                 const gchar         *startup_id);
-G_CONST_RETURN gchar *gtk_window_get_role      (GtkWindow           *window);
+const gchar * gtk_window_get_role              (GtkWindow           *window);
 void       gtk_window_add_accel_group          (GtkWindow           *window,
                                                GtkAccelGroup       *accel_group);
 void       gtk_window_remove_accel_group       (GtkWindow           *window,
@@ -202,14 +202,12 @@ gboolean   gtk_window_set_icon_from_file           (GtkWindow   *window,
                                                    const gchar *filename,
                                                    GError     **err);
 GdkPixbuf* gtk_window_get_icon                     (GtkWindow  *window);
-G_CONST_RETURN 
-gchar     *gtk_window_get_icon_name                (GtkWindow  *window);
+const gchar * gtk_window_get_icon_name             (GtkWindow  *window);
 void       gtk_window_set_default_icon_list        (GList      *list);
 GList*     gtk_window_get_default_icon_list        (void);
 void       gtk_window_set_default_icon             (GdkPixbuf  *icon);
 void       gtk_window_set_default_icon_name        (const gchar *name);
-G_CONST_RETURN
-gchar     *gtk_window_get_default_icon_name        (void);
+const gchar * gtk_window_get_default_icon_name     (void);
 gboolean   gtk_window_set_default_icon_from_file   (const gchar *filename,
                                                    GError     **err);